From b3b277c5661447ae1fc94ec5b8169674c645191e Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Tue, 6 Jul 2004 20:28:23 +0000 Subject: [PATCH] bitkeeper revision 1.1041.1.17 (40eb0b673jnCW3n1yVuLT8OFnMJm-Q) Minor slab tweaks to move ever so slightly toward 2.6 and make ia64 (based on 2.6) easier. (NOTE! kmem_bufctl_t is now a short per 2.6!) --- xen/common/slab.c | 6 +++--- xen/include/asm-x86/types.h | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/common/slab.c b/xen/common/slab.c index 2266baa9af..ab97bc5c33 100644 --- a/xen/common/slab.c +++ b/xen/common/slab.c @@ -117,9 +117,9 @@ * is less than 512 (PAGE_SIZE<<3), but greater than 256. */ -#define BUFCTL_END 0xffffFFFF -#define SLAB_LIMIT 0xffffFFFE -typedef unsigned int kmem_bufctl_t; +#define BUFCTL_END (((kmem_bufctl_t)(~0U))-0) +#define BUFCTL_FREE (((kmem_bufctl_t)(~0U))-1) +#define SLAB_LIMIT (((kmem_bufctl_t)(~0U))-2) /* Max number of objs-per-slab for caches which use off-slab slabs. * Needed to avoid a possible looping condition in kmem_cache_grow(). diff --git a/xen/include/asm-x86/types.h b/xen/include/asm-x86/types.h index e2b229edcf..3f1f0a6c6a 100644 --- a/xen/include/asm-x86/types.h +++ b/xen/include/asm-x86/types.h @@ -56,4 +56,6 @@ typedef unsigned long size_t; typedef unsigned long dma_addr_t; typedef u64 dma64_addr_t; +typedef unsigned short kmem_bufctl_t; + #endif -- 2.30.2